repo: Don't call g_hash_table_destroy on a NULL hash
authorColin Walters <walters@verbum.org>
Thu, 1 Dec 2011 01:23:10 +0000 (20:23 -0500)
committerColin Walters <walters@verbum.org>
Thu, 1 Dec 2011 01:23:54 +0000 (20:23 -0500)
src/libostree/ostree-repo.c

index 1ba63244c3495740f5e05e2451f229c79eb9ff69..f87bd33c4f197dbf2c467d0549cbc93b5584fde5 100644 (file)
@@ -1197,9 +1197,12 @@ import_directory_recurse (OstreeRepo           *self,
   g_clear_object (&dir_enum);
   g_clear_object (&child);
   g_clear_object (&child_info);
-  g_hash_table_destroy (file_checksums);
-  g_hash_table_destroy (dir_metadata_checksums);
-  g_hash_table_destroy (dir_contents_checksums);
+  if (file_checksums)
+    g_hash_table_destroy (file_checksums);
+  if (dir_metadata_checksums)
+    g_hash_table_destroy (dir_metadata_checksums);
+  if (dir_contents_checksums)
+    g_hash_table_destroy (dir_contents_checksums);
   ot_clear_checksum (&ret_metadata_checksum);
   ot_clear_checksum (&ret_contents_checksum);
   ot_clear_checksum (&child_file_checksum);